Merge changes I7839e334,Ie0407f65,Ifa3fb8cf,Icc0478cc am: 7951d73a4f
am: bfde799eda

Change-Id: I69a141fc22c0eb874e3a0d6fc168c0721482a1ea