Merge GitLab and Gerrit branches.

Change-Id: Icf882908c36e6e09a96a5c1fa04d4849311eabd8