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

Change-Id: I4431919630371ee77deefce037ce0f7bb7f1a503