If minor is 1, previous minor is major-- and minor is 22

Change-Id: I6ec6cf668c38aa9e844448078702610261ca8291