Merge c80b2ffa81b9ab6b170ba2cff6939ac6bd073d3f on remote branch

Change-Id: Id7728f184152bc735a7db3d894a260e82401af5e