Merge "Remove workarounds to use core platform API" into sc-dev