Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev