Merge "DO NOT MERGE: Temporarily disable APF on automotive platforms." into pi-dev