Merge changes I0ff1fc5c,I7a23d3bf
am: 7d199de8e2

Change-Id: I6f47c2f66d79b8d26c239c974dcea34e4e8fef67