am 9e30117d: Merge from AOSP

* commit '9e30117d8a94bddafe135bd9f50af8b3ac7d2e99':
  Remove unnecessary dependency on keystore_client