Merge branch 'cm-10.1' into jb-mr1

Change-Id: I907fd81de7553ef8d061f0656fe785227b4b6e50