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

Change-Id: I27789aee6e8b64e7cf63c0a52bdeba0ade2e63c3