Merge c0d5ca83d1e31771d3892772926d600723682b60 on remote branch

Change-Id: Iec0e74694d3a0aee24ddfa1da6e681159111f88a