Merge c25a6c256d37c0a56801d2cf2aad7c0c232101e8 on remote branch

Change-Id: Icb52132f5bc043904ac8599c07c5b300413b3676