Merge changes I35c3ca3d,I5522ee84
am: d32796a264

Change-Id: Idfd79c9bba32acad3f1344cf6e6483d6ae29e7f7