Merge "Fix keystore_backend_binder" am: 8fe42895ae
am: ba722fc203

Change-Id: I14edecad4e9dc55794a6505690c1c8dad71ccfc1