Initial cm-10.1 changes

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I5e6626659325dc5fd9e3dd0240b070890cd61dff