[automerger skipped] DO NOT MERGE Explicitly depend on privapp config.
am: 5ab2e1a019 -s ours
am skip reason: SHA1 5ab2e1a019 skipped by user nicksauer

Change-Id: I1854e8403e741da0322858d8d8fbbc6e136feb83