Merge def4fb9ebf363d7808df2f71738f7e7d21e347c3 on remote branch

Change-Id: I8ad2dd556263d00f50f5be7d0e895c4c88c636ee