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

Change-Id: I5695d4b2361bdf4ec9abe054418780572e660d2a