am c0896233: am e148910d: Merge "Fix an issue where the "mFrameCount" field was accessed without its containing object" into jb-mr1-dev

* commit 'c0896233f8c79077fe12b3ac34ce5c28d94596f3':
  Fix an issue where the "mFrameCount" field was accessed without its containing object