Support cascade and droid hooks#2

ashwin-corridor merged 7 commits into

mainCorridorSecurity/hookshot:mainfrom

cascade-droidCorridorSecurity/hookshot:cascade-droidCopy head branch name to clipboard