Merge 52ad4bbcd4e9cfa750831be20491fd2b391e5302 on remote branch

Change-Id: Ib8a6a078c3ceac914a10007cfda98442b24ceb96