Move $flags member var above constructor in ModifyEntity

Change-Id: Ia8e9e3d9c226a7929e2038bbefb7a4233c33559f
Merge "Move $flags member var above constructor in ModifyEntity"