To Backport the N-Mr1 Changes

To Backport the N-Mr1 Changes.

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

Change-Id: Ief41cc9ae7cbe5ba2268421fb3a7dea280d60c2e
CRs-Fixed: 1099376