am 3b676732: am 57ab9435: Merge "Adjust samples output pages." into klp-dev

* commit '3b676732913c1fcfbf6b948fe4e1a69e42f5faeb':
  Adjust samples output pages.