[automerger skipped] Merge changes from topic "ucon-logging" am: 8eb7fe48...
[automerger skipped] Merge changes from topic "ucon-logging" am: 8eb7fe48 am: ad8d39c8 -s ours am: e0f44991 -s ours
am skip reason: Change-Id Iacb47ea1a0571926a8a90c2eb36a37eae3dd6dc2 with SHA-1 89378987 is in history
Change-Id: Idc812060f5d5b83379b3b6fa69e39864db8d36ad