[INTERNAL] fix for type handling on P13nConditionPanel

Change-Id: I836ef5436c481909b01efec541adce3c6aaa09bf
Merge "[INTERNAL] fix for type handling on P13nConditionPanel"