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

Change-Id: Id80394fb62ce5892a5fbffd6cc73eafa26b55e46