Fix @covers & @since tags

Change-Id: I3c1b2a7248f8feeaa88418ea14af09e75c62858f
Merge "Fix @covers & @since tags"