Merge "add the FunctionalInterface annotation"