Merge 7f645fa641c96551be35fa8ac8c3bbef2aab4b41 on remote branch

Change-Id: Idc2340d03eeb3578362fe93bb7fd61e8df9f0d4d