Merge "Merge remote-tracking branch 'remotes/github/cm-12.1' into HEAD" into stable/cm-12.1-YOG7D