Merge changes from topic "am-ab4e3d279f8b4e678c68bca55d7c8074" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "set NBM_FEATURE_FLAG to true." into udc-d1-dev am: dd7c827f -s ours am: 9908fe95 -s ours
  [automerger skipped] set NBM_FEATURE_FLAG to true. am: b9ae68b1 -s ours am: f8b6b2f7 -s ours