Debugging from android merge