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

Change-Id: I3705a6b7c2db547c9614502582bd2f7ff55f4294