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

Change-Id: Id27ee1c5147bbceddf36c3159d6fbf654ab965f7