Merge "Unhide @FunctionalInterface"
am: 45a1ea33a4

* commit '45a1ea33a4e0eb7f1204c03611caf4699ed91d47':
  Unhide @FunctionalInterface