Merge \"BQ: Remove getNextFrameNumber Binder call\" into nyc-mr1-dev
am: f9de6e0d7e

Change-Id: I8ac76ca4bc0ed97deca8823ed8d4a75f594f7add