Merge changes I1a3e4a4a,Ie8ff85d8

* changes:
  Add B&R on-device unit tests to presubmits
  Fix broken test by increasing Thread#join timeout