Merge "Fix import of Rlog - generated by formatting tool"