Merge "Remove long standing debug code" into oc-dev am: f74a736add
am: ce822b2fb7

Change-Id: Ib9702a224dae742c6a6f1418567e537d8e857e84