Merge changes I45940d2d,I100b6246,Ie0ba58b3,I7943e7a6,I172cef38, ...
am: 4fc76b3ff6

Change-Id: I37c2a02a5e3a7a2a5d8f20a440eef6b8f1faaef2