[automerger skipped] Merge "[API feedback] fixed API for NR" am: 7afba9e583 am: ffddf67508
am: a70d308d65 -s ours
am skip reason: change_id I133075a3688c3fa7550c8a2f43bc13d8b25999b2 with SHA1 ae718f9e56 is in history

Change-Id: Ib269077200926158c639506983ae446a02e55435