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

Change-Id: Id489ee98cc82ad9023f75e6c56fec5efd81ad293