Merge "Merge "Fix javadoc which was broken with renames" into rvc-dev am:...
Merge "Merge "Fix javadoc which was broken with renames" into rvc-dev am: a7dae497 am: d34b92c1" into rvc-d1-dev-plus-aosp am: 28f9d769
Change-Id: I404b877669164822fd0dbc4fea6cb058168f358d