Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev