am 88a6301e: am a20490cd: Merge "Disabling debug logs" into ub-now-porkchop

* commit '88a6301eb3062ee2183b9bcdfd3939fefb832fc1':