Merge 98144e7108a6464968f50fc27261a983c98b0af4 on remote branch

Change-Id: Ie924482947358df90e6a38f51707c18405848f8f