Merge "Re-add return statements accidentally removed in aosp/2461534"