[automerger skipped] Merge "Fix enum name and typo" am: 5007054a am: a14b5cdd
am: 74fe5b66 -s ours
am skip reason: change_id Icd2db5852607885fb094adc02b67a125e363060b with SHA1 21967eb1 is in history
Change-Id: Icd45a3190f12715cd07de7529c9bbecd499c847a