Merge changes I4faf15bd,If328eac6 am: c275dab214 am: 2ce02ce572
am: 06a5f1b6eb

Change-Id: Ib1d552e929b51f60e2c488fb3d689943af4425fd