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

Change-Id: Ia0c520eb080e02b0b51d86b0c8f88da2cbe1c429