Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev am: c977c776c2
am: 70093bc29a

Change-Id: Ic24b66e7d17a6595c084eaa16a01818c810ca201