Merge "Update system APIs based on feedback."