Merge "Add more APIs used by platform targets"