Merge changes I478f1d55,I39bb0916 into qt-qpr1-dev

* changes:
  Fix boot regression from KeyStore being slow
  [MAC rand] Fix unit test slowness