Merge "Adds validation check that certain partitions come from a single...
Merge "Adds validation check that certain partitions come from a single build." am: 206ef1f4 am: de300765 am: 563603e4
am: 85fd38b3
Change-Id: Iddfb59dc90fe5e2c3c29c8608e081534e655f74f