Merge 6af76956d81649b4deb784d0e248dd6d9f8789ed on remote branch

Change-Id: I8c0926a0cd65910a3376cd1bfd92505f3927f501