Merge da6d31bbdfdc70788c90031c65edd1aec7e254dc on remote branch

Change-Id: Iac7c05de7798264c42a11e9cbde0f607067d3c9e