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

Change-Id: I086e5b29d46a8aa81596c6b477feae86e523e622