Merge changes I0613c23f,Ibeab8d0a,I8bd668ad,I7d3a16be
am: 5cf5b30990

Change-Id: Ibe34e78e53a15e987042703fdd27d6393e4e7d59