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

Change-Id: I47df512481bb10d466011919691f5808612685f7