Reconcile boardconfig w/ cm

Change-Id: Ia25ff22a1316cb4af656ca7398688da1634d1b5c