[rhel7-branch/master][PATCH] Fix target partition selection for standard partitions