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

Change-Id: Iffc4b5cebfc835eeb0b03f4e954aeb7cd4aad35f