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

Change-Id: I2f5572ab3931b6c3da7fb54c66be9530a69b55d7
CRs-Fixed: 1099303