Merge 90bc3138b7db20695e13ff11a66bdadbe258f6e4 on remote branch

Change-Id: I73dd24b7b4728642897353574954ca4bfa6f9fde