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

Change-Id: Icf7133de56a42232e5e9b67c6b8433dc0a8d3e6f