Merge "updater_sample: Add @GuardedBy" am: 2759733136 am: a37a085a11
am: 7d5746309b

Change-Id: I89adebc0d563a0b4a543a5321476ecd661d7d21f