Merge d3b58cccbaf7bc3767f1db0fde53a0d127d62a87 on remote branch

Change-Id: I54fe7f75254eec5714bc67a88ff1c3dbaccdee93