Merge "DO NOT MERGE: Fix build break." into pi-dev-plus-aosp