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

Change-Id: I28256a8768d33c79be6c4c2384b93ceb574cd72b