updated to track cm's changes

Change-Id: Idb5fb9c1f0af66231d834cfcacd39e17691be2a6