Merge "Move RCS table creation flag to contract class"
am: 0c8bc10ab2

Change-Id: I81f0a24320171fee4d20b661c08d8144e84df181