Merge "LibGUI remove DEBUG" into oc-dev am: be597daebd
am: d9517fe958

Change-Id: Id677c4ba2c28922c4a3f64fdc2b114d3e3031dbd