Merge changes I5e14eeb1,I0bcf0516 am: 77b32a9cb9 am: 643670ba31
am: c684482eb0

Change-Id: I2c624fb52aff19e79a85004d3186382b090b523f