[automerger skipped] Merge "DO NOT MERGE: Fix build break." into pi-dev-plus-aosp
am: c9813fc4a6 -s ours
am skip reason: subject contains skip directive

Change-Id: I8f92d992daafbfdd2019d90f2b11bc1eb97f507b