Merge "Fixed OatWriter checksum for raw data case"
am: 8f13b4a3ae

Change-Id: I4ecb81e593c0c10bf92c237821697a0c84855aa6