Merge "apq8084: disable logs in user builds"