Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 am: 561498e357
am: 80fba27032

Change-Id: Ideebaff704419c9a97d066ca97ead40935779118