am 6d88a98a: am 0cef5c46: Merge change 21056 into donut

Merge commit '6d88a98af4be122a8d8945e8da22ae9f45779622'

* commit '6d88a98af4be122a8d8945e8da22ae9f45779622':
  Add a functional test that renders all the layouts of ApiDemos