Merge changes I5fe69642,Ia54ea81f,I6c80f38d
am: 29867fd46c

Change-Id: Ic26e1c4eb3e2962bd953ac44eff9530b4cc29cf8