Slight more CM reconciliation

Change-Id: I035c7f1b713bddd9b0bf2b0027bab9c1d88d2f18