Merge 31f6ddb0b4fec231aa54c7befb18e21a6874ceba on remote branch

Change-Id: Idfff74938c5f8dac8fb6c0f49b78487fc90d5d77