Merge "Added FunctionalInterface annotation"