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

Change-Id: I698520ecd5c44fb34a53708ce58cbdec56a3e1e2