Initial cm-10.1 changes

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

Change-Id: Id2874158f7d18c00afc9ab39fd3bbb60c02ce77b