Merge "Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH" into nyc-mr1-dev