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

Change-Id: I7b036cbac646b69494c2e763592e7c7b2ca99ec7