Merge 060f6b5f57fe1c89409a91da54d4307c7bd16503 on remote branch

Change-Id: Ifa9890b82d2f214508f24dc96a94b6e43138c7d3