Merge changes I4d8da7ce,I4da5be01,Idfbead82
am: 31167a5785

Change-Id: Id0131ff628a47b611e39c026243cf5f11ce9bc49