Merge c9bbc45602332ff303b00724a9ca633a90832b24 on remote branch

Change-Id: I681b71c540a9152687bfa2e94ea64608eb0dc0c4