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

Change-Id: Ib2bf332660012e0c40f989d7f2a92715a93919c0