Merge "Add @deprecatedSince and @apiSince as knowns tags"
am: f094924d25

Change-Id: Iad21e75ee3c93c4e30ac9dbba4305b828cf4d96a