Merge remote-tracking branch 'origin/fm.lnx.2.1-rel' into fm.lnx.2.9.1-rel

Change-Id: I9d61fbe8961676660c08a02ddf377894baf0e203