Merge "Grants app visibility to both ends of instrumentation" into rvc-dev am: bb5769554d

Change-Id: If31261102cd22bd4ac132ea718398733a596df42