Merge "Support for product-specific dev keys." into ics-factoryrom