Merge b58b040ce59e0be6f88069416a10be290b0f5791 on remote branch

Change-Id: I9e51f05c76310a8ec1577439923aa4447c0567eb