Merge 8b347a74e077731491b225d3ff6b6a40c94d9717 on remote branch

Change-Id: I890ab28a05ef24f4ff9f367dd86d938d6b100a0c