Merge b6dcb0dd1d450c90adafaa286b3db8b11f034cc4 on remote branch

Change-Id: I32502cf8ff7dfcfae23140d102de783e41fb6f11