Merge 288b5645325671b506138522172a629643e104da on remote branch

Change-Id: Idd5372cc1d0048c74b2fd7c4ba447b38071c5ea9