Merge 8cceab229fb2e8efa0b9a099a4e9e7612aeab799 on remote branch

Change-Id: I7ceb7ede2fe8774d32cac4d5e3fcf956df529496