Merge changes I35c3ca3d,I5522ee84 am: d32796a264
am: fce22b0377

Change-Id: Id331350546869151f5cc6addd371b4b97a85dea8