Merge c58414a0ddf2eb716ec6551446ba556eac4495d3 on remote branch

Change-Id: I8c0f935925f3a9262e74ecbe9901d1251531a2ab