Merge 2f73f7bc3ca4deab8f86563d2a606e814bfcf6b6 on remote branch

Change-Id: I55c9069ceccf7573b78ec459e81a0a6ee1523d3f