Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev

* changes:
  [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77
  DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now.