Merge "fs_mgr: Clear AvbOps struct." am: 6ea4f213d8
am: 983d542d49

Change-Id: I77f3230373de0aff17fd66a784b7b25834b97f1b