Merge eb05e369e3392221400660ea188eda54939c30ec on remote branch

Change-Id: I64cfed750f4a74500c188c8da8afd5d5ac35053c