Merge 7b6fe2145c938060631d648db76971df2eedeacf on remote branch

Change-Id: I9d8ccbc208fb82f255232fcfc2d807378c8bbf0c