Merge changes I45fbac4a,Ie390459d am: 3b5538965e am: f9ce38e3e2 am: 9780edadb4
am: 4213af2b1d

Change-Id: I785a62f8efaccc7d1d6fc5f1ff4239eb6cbda074