Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev