Merge "Remove workaround for Retention.SOURCE annotations"
am: 4dd261c853

Change-Id: I05b424abdbd6ebbfc795e965150103364a875427