Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev