Merge be4ffe06f2aa38ca570f3360a23d88a11e4d7dd8 on remote branch

Change-Id: I07816a454fdf938dc9618672130af8ec869df0d9