Merge changes I86076b07,I7409732e,I248b1b27
am: d773fbbb5c

Change-Id: I7ad0e8ccb29f5f626b6f4ef4b951f4f321a607e1