am 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev

* commit '63e550f2026e749e7be5ab03655f0a5105457b9e':
  Add getters and private constructor