Merge "Add new SystemApi methods for mainline"