Merge "Revert -Wunreachable-code workaround."
am: 1ce5909dfc

Change-Id: I02c17d4c17e6c724a657105a7052f6e648b54a86