Merge changes I45fbac4a,Ie390459d
am: 3b5538965e

Change-Id: I536828c2df621eff0c6c528a2ad2b74e863eab79