[automerger skipped] Fix enum-compare warning am: 0c5dfbd743  -s ours
am: 87f4b0e580  -s ours

Change-Id: I0e5d5c7f8dd649620ef127c5331b1eba2dfbf846