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

Change-Id: Ic3d7bf6773c61b8f738164e6a41ea616dd0286ac