Merge "Add @export to frontend scan enums" am: 76c90b21cc am: cc5bbb2b38

Change-Id: I3f6b43dc5afd3548c7b24e62ae154735eb4ac6ae