Merge changes If6bd630c,Iade01cd5,I2ca823e1,Ib2899bce,I123f30f9 am: 04471122 am: 346517ff am: 6918c2fc am: b79ebb56 Change-Id: I3c8e93207db54d0b351d387cc8b97affc2f79aed