Merge 8c7020936b74a671e6124eecec4f51b2852ed5c7 on remote branch

Change-Id: I89f8a847e103c2cd8c706ef9c0646c228b3f78f0