Merge "Unhide @FunctionalInterface" am: 45a1ea33a4
am: 79bd8e8815

* commit '79bd8e881510d62f0fd7198f21dba42a06bec7b8':
  Unhide @FunctionalInterface