Merge "Add tests for minor version upgrade enforcement." am: ea8ff054fa am: af52b48490 am: 2e14b7cc0f
am: 982f85242c

Change-Id: Ie391c983761cd540775abe2e2d72feeeaa2ec5de