Merge changes I3d2b23b5,I9463e2c9
am: 2e72cdf3c1

Change-Id: I88e7591c821d5553c631e0ce07c174f06a3f2c47