Merge "Remove accidental debugger wait." into oc-dev
am: 3157927652

Change-Id: Ic9013b21893803ffdf2fb7b156fb061f4c2c2321