Merge changes I09e8be0d,Ic94816e1
am: 82393b8382

Change-Id: I8b290ab7f39ce48a8d05942bf9c3d8070d9a4126