Merge "Make logs.i so they show up in userdebug" into main