Merge remote-tracking branch 'gitlab/master' into HEAD am: a51ae292ee am: a369f5b18a am: 7ff6da0353

Change-Id: I53b883746a2589506627007d66e90f29b0d4833a