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