Merge "Use @IntDef for manage actions" into lmp-dev