Merge changes I4a13082a,Iccaf0bff

* changes:
  Keystore 2.0: add async_task::AsyncTask tests
  Keystore 2.0: add async_task::Shelf tests