Merge "Frameworks: Move Log holder to be preloaded" am: 7dd3a7d5c0 am: 5f9ba1a2b6 am: 9bd51f6fcd  -s ours
am: b2512c70c1

Change-Id: I8de2170fd32950322b0708072458d019c883cab5