Initial cm-10.1 changes

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

Change-Id: Id561b55bb94e31dffb0dd61631babb2ca70494c9