Merge changes I72aaf4d6,I420cb87c,Iab7c6cf7,Ic4388e20
am: 39624169e7

Change-Id: I7ffbe4123b13b1830c3e18727b21e1f21e131927