Merge changes I5b4a87d6,I131315d4 am: 48c0de4907

Change-Id: I83a35efa9a1b5115a6203a4ab1d4bf177097b657