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

Change-Id: I6a58b1e89d1245ab04ab252ac6d6b32e4033f2fd