Merge "Fix braino in enum use."
am: 201c81947f

Change-Id: I80da542ea0bb51f7ecf78e3afc6b79db5da4f2b3