Initial cm-10.1 changes

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

Change-Id: I9335fb982d69def8850a04b8b0e3705e3af0a5a1