Merge 45c6c78d2ff8727d663ace0a58a9736e2e92b037 on remote branch

Change-Id: I3c944a154979b552f3d3ccd77ef00a0513c634d7