Merge "Fix enum-compare warning" into pi-dev-plus-aosp
am: 6be953611f

Change-Id: I9900b604d310945aa9ab752b56bb6954882607c7