Merge changes I1cae6530,I7ffaa260
am: e34d239023

Change-Id: I820f359622aba7cb871928116acab57bdee53c47