Merge "Make getFrameNumber lazy" into nyc-dev
am: 8cddce3

* commit '8cddce3f8f503b2aa8b993fef6406645c3e80da6':
  Make getFrameNumber lazy

Change-Id: If81ee9732424750465ceae5d2136bb23288f6a5f