Merge changes Ibdecf0c9,I41bd92a7,I5669ed10
am: 561498e357

Change-Id: Ia0ba17bfee3d97dd4390f942ec7931c2b7a68ea6