Merge "Fix frame numbering regression."
am: 91837d7efe

Change-Id: I406f8fc76b8097cd05aa44946c56774c3745e68f