[automerger skipped] Merge "Fix import of Rlog - generated by formatting tool" am: 2b1b1bb22d am: a041de7832 am: dfef4242e0 -s ours
am skip reason: Change-Id Ibe36c6d0fe8bfb6277d7b9034af8dbf45ce2f716 with SHA-1 1dbea2f840 is in history

Change-Id: I4afccd29c36f586c1ef9530fed1c27b667f0e1df