Merge "Remove INCLUDE_TEST_OTA_KEYS."