am 278b2597: am 95b1a97f: Merge "Fix null-pointer-dereferences accessing the SampleTable"

* commit '278b25970b9e3a8052b1421fb828e3ef17988f5c':
  Fix null-pointer-dereferences accessing the SampleTable