Merge d1e4dff47f94821f4f16d52e5a3c49a8609594ed on remote branch

Change-Id: Ieecae6ed7f4de15bd1a8cce5e2a74eadf1730efb