regressions around inserted extra enum values
into ShapePropertyId

Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3