[automerger skipped] DO NOT MERGE: Move load & restore logs to logging.cpp am: cd780b456f
am: 46ecbc897c -s ours
am skip reason: subject contains skip directive

Change-Id: I295d56f67eb90e5cc85641560399bfeb3e51bbd5