Back Merge from rel branch to dev branch  after N-MR1 upgrade

Change-Id: Ie9fe6b9aef5c87153352760619b1d82a2f900ac3
CRs-Fixed: 1099303