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

Change-Id: Ib84625789ddb69d831a1eea71f0a04c5eb8913b4