Merge bfb0d7b8254171df3a821be586d59b0931815179 on remote branch

Change-Id: Icc740e59b0c42c3d004c6d7b76a44fbb84dc354c