Merge 8a98f6cad485e2ba8f8206e85c677b3326a5800e on remote branch

Change-Id: I575be68365094aa8b7d458a03aaee2de7c77802c