Merge "Appending per-partition os_version into AVB props" into qt-dev
am: 61c5d29655

Change-Id: Ifdc58c3bf9d4ce0edca9fe14f8a9fe65e5e4d610