Merge "Get ready to add System APIs for use by SUW"