Merge changes I5b4a87d6,I131315d4 am: 48c0de4907 am: 0bfe8df121 am: cf044e0f1c

Change-Id: Id86b51c063544d6f65eb1c2a88d5646f4f2ab856