Bunch of returns missing from backwards compat hooks

Change-Id: Ie10a3f74292976cb11cd16abdcb61f55aee06cd8