Merge "Track core platform API change"