MFA Merge:

Change-Id: I9d7521d6af2df93ac48e1b035b4c1eb316cfe240
Merge remote-tracking branch 'cm/cm-10.1' into db42