Merge changes I5482a45a,I0185e169,Ic17c5e1d am: 06d5da59ac
am: e110e665d2

Change-Id: Ifb1420a32127de349af0ab1bdd832c99df49d3ee