Massage APIs for upcoming doclava change. am: 983df8cc6c
am: 5b89182ff8

Change-Id: I3c50eae5f6f9871f3fc4f8dc850a15fdc5052b95