Merge 965fd213e34fcb52fd12a7296c6391e1a9dbfb41 on remote branch

Change-Id: I509022c8b696159ee757dedd337f961cf6f80e82