Merge changes Ib7227f18,I96926932,I46476112,I2c17b1e4,I47ee9e39, ...
am: c809601217

Change-Id: I2ae5ddde5595161b25c3a2d59941f59dcfcc0847