Merge "Update OEM unlock summary string" into nyc-mr1-dev