Merge "blkid: sanity check 'end' address must be greater than or equal to 'lable' address." am: 58e29f870e am: 1dae5eab97
am: 3d484247a5

Change-Id: I4fa25d417656f44b80eda2d2a1a337b3b51bfbcf