am 0de7bd8d: am 4a1b80c3: Merge "Added a couple of new properties." into gingerbread

Merge commit '0de7bd8d434ec62592d4ee881ae3e033090900c4'

* commit '0de7bd8d434ec62592d4ee881ae3e033090900c4':
  Added a couple of new properties.