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

Change-Id: I005f51c3f1f074ba9f05419f1b28b8001e6e4e37