Merge 40073ce1145cf19f1034ba5b93ff36b5e74c65e1 on remote branch

Change-Id: Ie754dbdba7e4ed02e18aa7e535e8fdabf5151628