Merge "Add release 8 flag to reference implementation run too." am: 029cb250d1
am: ff39831787

Change-Id: Ie9fe7a356311a3149992346e57c006552cb964e3