Merge 90e852aa06416371838bff386fa72d13f829bfb1 on remote branch

Change-Id: Ia20bc4ea5f7f655ebd0ae6989a0af1a6507c3b70