Change-Id: I5fe0de436dd5e2c21ab9eb08b47c1995b5154a53 Closes-Bug: #1784038 (cherry picked from commit 1e31dcaeb5)
1e31dcaeb5