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

* commit '68757ef6bcee725f983fd4c793d7be11fbdd3cd6':
  Add getters and private constructor