Merge changes I60816545,Ib8c46b40
am: 9601ecbb27

Change-Id: I9c760c5c85ca0282d94578538df360ca9a348886