[automerger skipped] Replace Rlog with Log temporarily am: 75ebf6313e am: 554c536b76 am: 14105b5489 -s ours
am skip reason: Change-Id I112457f83e5d43ca0d3d18a3ba384a5763e5e403 with SHA-1 e532d237c4 is in history

Change-Id: I6bb20e374d48c14c1e66254222e19e6b60e54941