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

Change-Id: Ibd76aad20fa0c313952f07d20589531b80b6b6c9
CRs-Fixed: 1099303