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

Change-Id: I0e49ba91d508f0b63ee2bb1019dba4461df25537