reconciliation w/ cm

Change-Id: I8e4a2ebf82125cc46aae69aeb2159178401e28d5