Merge changes I5e42f85c,I60174623 am: adf595900e
am: 8a44827d49

Change-Id: Ic843385cd496f97b8a881fc02189864471e0079c