Merge "Move RCS table creation flag to contract class"
am: 984e14585e

Change-Id: I0d9ce89905457ee09e0600e98b2c50c7c5b1dfd6