Fix: 150077028 Test: manual inspection of com.android.wifi-base.zip Change-Id: Id201a3410a46e0c88a77e6f88e5b85906c7a6c8b