Merge "[API feedback] fixed API for NR"
am: 7afba9e583

Change-Id: I703b745d276171f57092668d502441d45ae6ded6