Merge remote-tracking branch 'upstream/cm-12.0' into HEAD

Change-Id: I4e7b146c4a506a59a88b6a099d9d49bdd428b515
Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>