Merge "Add checks against incorrect context use in sysui tests" into oc-dev
am: 227e65d818

Change-Id: I3fad5f17321adf92f5f80c8ec04fc8fc1e4128e2