reconcile w/ cm a bit

Change-Id: I905275f83b05fd4a496a12999f7d9d8ad644a23f