Merge "Check validity of partition for getvar:partition-type" am: 9810709d91 am: de809e0122
am: 00ebd5553b

Change-Id: I80a53919af0bc14efa8a08a2b6b93a826540b840