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

Change-Id: I6538ac98fa28f6f9c08d45a2cedfb8764acbc9ef