DO NOT MERGE Pipe context through to camera

  Bug: 17203825

Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468

Will also apply this one to haleakala.

Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a
4 files changed