Merge "Fix enum-compare warning" into pi-dev-plus-aosp