Merge efd1525927a84f7ed676ba0173c304ab484693cd on remote branch

Change-Id: I262231edca382497813a1f20e48dfe955d9fc7d7