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