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

Change-Id: Id1d92f43557346bbe8a00d5271cbb705eec98a59