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

Change-Id: Ib2bf28d4235cc579664fd78f92bcd73528079f02