Merge changes I0a1aa003,I000c3c22 am: a4a1f2089b am: e69ccc7fb6
am: 1db082a142

Change-Id: Icbf9dfba83879afd62bf62f1b1343acf3f045c5c