Merge changes I921c81db,If2a22882,Ide7e7642,I5593cd1a,I923e6043, ...
am: 1869736253

Change-Id: I509a96e6d53517419f53773d0edd922a4820ffde