Merge changes I150aefde,Ic6fc1807,Id82a83fd am: 474407820b am: b9de8e7df1
am: 157de1218f

Change-Id: I9f86ccb16f3d3e143170bfe0b1e2892c9afa6d97