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

Change-Id: Iaf5aba1c4146da1352fea149171832cff88b3978