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

Change-Id: I9dc8f544fd6602b8040ab884e7a79ce4ed711b30