Merge changes I5c5c4eb3,I36712447,I5b78d449
am: fd5241f120

Change-Id: I656e66400a1a328e5236bd3e3dfd30d291f7d858