Change-Id: Ibca1716cc2f86ffbd3a448162802b2c890fc7ff9 Closes-bug: #1527123 (cherry picked from commit 4a4e9f3baf)
4a4e9f3baf