[automerger skipped] Merge "Attach logging package to staged rollback IDs"...
[automerger skipped] Merge "Attach logging package to staged rollback IDs" into rvc-dev am: 29a48e1d am: f2af0a08 -s ours
am skip reason: Change-Id Ie942fdb9313137c2dc6e696840262dd457558c6d with SHA-1 9d1eeeeb is in history
Change-Id: I4bc52ce8e9e6755885ad127f8a98151157e69160