Merge "Refine performance for calling into ContentCapture" into rvc-dev am: a42c95cd am: f24340af Change-Id: Ia2c7ee2e2b95e0153910dbfc0f510f7c347d3d66