Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev