Merge changes I983f361d,I899c8433,Ie6f4b029,Ic3cb9c82,I27107d05 am: 002959e492
am: ab30bec294

Change-Id: Ic1439d5b61054e53cc92fb761317da7024e18d79