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

Change-Id: I77d33a5d2363670ff9b6b96a281aee8f967f648f