Merge 98e255fc1f809454ce2cdb21f018187ea765e7d9 on remote branch

Change-Id: Ie13a1ab2de93c1b4df64bfff7c2f67f7aa1e6321