Merge changes I7a3c181a,I72c60ec8 am: 6aa1b01316
am: 03784e1aa5

Change-Id: Id367bba13008153736cfd1ffba59c550fb11fa4c