Merge changes I94edfc1f,Ia40d7761
am: 92863bc8cb

Change-Id: I6cb510243badc19105765c928816bf688088bb2b