Merge changes Iaf9e851d,Ic4cbf797

* changes:
  Keystore 2.0: Revise GC.
  Keystore 2.0: Add shelf to async tasks.