Merge "Force application context for KeyChain bindings" into nyc-mr1-dev am: cabc4f5945
am: 7a64f6cbfd

Change-Id: Ifedbd9edda8450c26332f57095db56bc88808533