Merge changes Ice70d9ab,Iba7ac028
am: 01320a387b

Change-Id: Ie9fcffc1626270c19441590fd75f76fbc907ca88