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

Change-Id: I8b0fa28815b20b81244e8d116ee9d9aed60bd831