Merge "Fix import of Rlog - generated by formatting tool" am: 2b1b1bb22d

Change-Id: I10b31addd35c669432746a2b128fec340d373b49