Merge "Fix frame numbering regression." am: 91837d7efe am: 7cbaae26ed
am: 7050682367

Change-Id: I5550c613939e60ea4fbdbd887a8d04a91005791c