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

Change-Id: Ic0efac1c5b2abace1e3075eb8b08f4c022a5414c