Merge "DO NOT MERGE: Add classes needed by SUW" into pi-dev-plus-aosp