Merge c8e71b489f353af1abf5860ca81bcf31f00e23b1 on remote branch

Change-Id: I12b81985ab000b3add8445815a80a233e50a72ce