Merge changes Iaf823919,I5b95b358,I24eae032 am: ed7c7e6f62 am: b13b01d529 am: ecaf388d27

Change-Id: Id11135b58b41e47839b70e1f787430d2288f8c47