DO NOT MERGE Explicitly depend on privapp config. am: 5ab2e1a019 Change-Id: Iba2c25e865471a05f20a5a19e90d0b2e4a5ea54f