Zygote: Additional whitelisting for legacy devices. am: 040c21f6 am: dc464a80 am: b45530f3 -s ours am: 7c69c577 am: 6f9b0a24 am: 8cd41967 am: 2a17f243 am: a9582772 am: c0e8a92a am: cb635532 am: 636bbaeb am: b8e6bcaf Change-Id: Ie578a17038876d92e55f2d9f58e6255ea9467d85