Merge "Grants app visibility to both ends of instrumentation" into rvc-dev am: bb576955 am: 1e3f20d1 Change-Id: If945916604e3fa154289c52bda0cebb59c1fff35