Merge "Frameworks: Move Log holder to be preloaded" am: 7dd3a7d5c0
am: 5f9ba1a2b6

Change-Id: I06eee3546daac89c36a8f26bd4c51d8f2e972377