Merge f6cc050e7da66d3f42a561f2ca3f1a87be72e86b on remote branch

Change-Id: Ie0f1b18827bd485cca42e9ade32445e9316bc3cb