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

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