Merge "Add @deprecatedSince and @apiSince as knowns tags" am: f094924d25 am: 0b19b44d8f
am: 6cb8bd90b6

Change-Id: Iae8c7a08630d0c0cc19df14102f08b930887f537