gitlab #722 Change-Id: Iaaaf8c2084bfb5a1c7eb7339535a6b4a09010a32 (cherry picked from commit b04c7265)