Merge 6ed3747f5c65428d89da2043675b6fef0b39323c on remote branch

Change-Id: I59477f80e679faec1e85c17da1e03b15d5f500c9