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

Change-Id: If60e2ace22f215464757ce97b181d0a59f104a1a