Merge 65b72aca50c99d5ca55524249b9a5206a26dfca2 on remote branch

Change-Id: I45802581ca852c2af2c706194399202f78db0773