Merge changes I7748934f,I008ef537,I1027e87f
am: 132fb22957

Change-Id: Idb0a92939564554becffe4cfa7209f9c220176e6