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

Change-Id: Ia7124a423e9caab4481230ce3a093c75d6c105ff