Merge changes I6f281703,I1450fe2c
am: 457c32100e

Change-Id: Id99cc4ce25a5d371037a89013c13f2e16022cc94