Merge changes from topic "am-d90c234d3e16453a8164bc783dc0659c"

* changes:
  [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c5 am: b1003d47 -s ours am: 434c6572 -s ours am: 9b39c5f6 -s ours am: 076ca82a -s ours am: 904cdb30 -s ours am: 885365dd -s ours
  [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a am: 42c14393 -s ours am: 1d6a1c98 -s ours am: 11a01ff2 -s ours am: aa38c573 -s ours am: 77a3d634 -s ours am: fcc6671a -s ours