Merge "Use fmq for camera capture request." into oc-dev
am: 997b94353a

Change-Id: I19cc5ca62b655d0923454dfceca1816787e679d4