Merge changes I09e8be0d,Ic94816e1 am: 82393b8382
am: 6550972cf7

Change-Id: If4d8a3e392cc4eabb1b90ae9a193308b883c140e