Merge changes I6dc353a2,I7df990f0 am: bb612a356a am: 3a3e02e835 am: f42618d1cc
am: 1eefd55b49

Change-Id: I14b5d79fea6049744360a7c9c7052ee02da32ef4