Merge changes from topic "am-a181e735248043a89eb9152ea3ac8c2a"

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into tm-qpr-dev am: 43bb3bb36e am: fafec64b89 -s ours
  [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: a3e618a77b am: f77f294fa7 -s ours