Merge "Revert "Use get instead of implicit cast on Return<*>.""
am: 5329acb61f

Change-Id: I86a2469e37c515129e8b679e241800f44ccabc27