Merge c2e9de7a9ba3541a4ee607746b96d2f9fede6766 on remote branch

Change-Id: I51761adb7686d1fbf698c7054278beac96915187