Merge "Fix build error due to null annotations in core platform API"