Merge changes from topic "am-012a43fe823b409d8545a41bdda41910" into udc-dev

* changes:
  [automerger skipped] Merge "Prevents the OOB data generation procedure from getting stuck because the SMP state machine is busy" into tm-qpr-dev am: 07a33cee -s ours am: 73e273c7 -s ours
  [automerger skipped] Prevents the OOB data generation procedure from getting stuck because am: 800286dc -s ours am: 6231a9ea -s ours