Change-Id: I351279dab0d90e60573df7db4c80b63320dff787 Closes-Bug: #1968734 (cherry picked from commit 66eb424de5)
66eb424de5