[automerger skipped] Merge "Use RLog instead of SLog." am: c0b23c30 am: 49b27e05 am: ac7de78e -s ours
am skip reason: Change-Id I09eaaf7283a1ac9bf9774b7e1cb5b639de2b25a7 with SHA-1 0b6297d0 is in history
Change-Id: I238b814b43d86641872911a3d7df4d2a62ed2316