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

Change-Id: Ib3c32e22fd7d78bb065a43dbcc6e5097da878aee