Force application context for KeyChain bindings
am: f04a663d6a

Change-Id: I16c31a9c31527a79addbd2b44003f8fe56cb652f