Merge d373a1bb948ea5145591717cae52181c54b6e7f1 on remote branch

Change-Id: Ie86f56bf5cf3b8567d53cf24b6ee4742a9ebe5de