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

Change-Id: Iac5b5b7d729769cf9005391819657573ddc5271f