Merge "Expect optional (offset ...) in frame dump." am: 4578d132c7
am: de8b9c5eeb

Change-Id: Ic426288ea73c3bfb3cbe3b97da5a7284f1048c37