Merge changes Ia4244757,Ibcdf69d9
am: f3186de123

Change-Id: I3a790d6abfb297cf8dcb3d752ccc220ae203e658