Merge "[automerger skipped] Merge "Appending per-partition os_version into AVB props" into qt-dev am: 61c5d29655 am: c344b21ef4 -s ours
am: 9187e1232e -s ours
am skip reason: change_id I21a77420f2e8a3456f7a8cae5158eb8fc41319e7 with SHA1 9b54801b58 is in history

Change-Id: Id3212e45cd08aed079ad8f0096441a2b307bff0c