Merge 8b55c250a4d27bbe096ce20de6c6c690fefdc8ca on remote branch

Change-Id: I0a6f7503c642a549492d3ea569ec63085ca0611e