(cherry picked from commit 1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d) Change-Id: I085b68646565bbf904e70734008efe5cc9f21eda