Merge changes I485051ab,I8bd5b7ef
am: e57043081e

Change-Id: I590fac7aaa390b06c1c6cbffd05832423d1c475a