Merge 1fd72b2fa7a9c3fc239df64cd92a344e75de3ba1 on remote branch

Change-Id: I5aa4daee49257e6686c0f9e6f69df693cb16f65f