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

Change-Id: Id4261cca39b6f16c5de8653205c2ae3fcf026f96