Merge changes I525bda55,Ie6445f00 am: 22fc95370c am: 7ff16b416c
am: 579e2f654c

Change-Id: I2cd3f05a5722e480eb723a7f42787b32f923ff96