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

Change-Id: Idad63da1d39457f14bdbf3e087d36d7fd1fe5f6c