Merge changes I5a01d709,I1b7da86d am: 95d9c6164b

Change-Id: I7079ddf41c18c3c073e3a0234fbd15f40a339315