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