Merge changes I558b2d71,I1afce18b am: 064a1c38e7

Change-Id: I1cacbb93ae94c4e1fe5d0b4d78c6aeb12b186270