Merge "Fix NPE in TaskSnapshotController" into oc-dev am: 6846676b9b
am: a218d21d2f

Change-Id: I460acd21294ecbb23d943ea24dd1f8112fa5c69d