Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev
am: b952c7557e

Change-Id: I66e78a3eb612a16d9dfcac749cb68c4f9e2e7334