Merge "Switching to the relevant SystemApi instead of the the @hide API"