Merge changes Ice70d9ab,Iba7ac028 am: 01320a387b
am: 9c290a08e8

Change-Id: Id70264e1b980eb3ea68425fdb44160e364b83515