Remove unnecessary xxSys dependencies
Cherry-picked from !264 (merged) on master
To be cherry-picked also to 2018-patches
, 2017-patches
, 2016-patches
Cherry-picked from !264 (merged) on master
To be cherry-picked also to 2018-patches
, 2017-patches
, 2016-patches