Merge "updater_sample: Add @GuardedBy"