Merge 35ccdd869d3e4f9b1d25e62b7362a90912e59ffc on remote branch

Change-Id: I483b9af5bf0a6906d9da264f6370f18a3da04d38