Merge "Fix Doclava test for changing return type"