Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev