Merge 0e9bcef4691ab655b436ec4704812da43dc0b296 on remote branch

Change-Id: Iefd556134650f758aac6967af49c09164069f4b9