Patch 3.4.97 > 3.4.98

Change-Id: Icee9442239c7453676c21d5aed0282a0f45f99c7
Merge remote-tracking branch 'daeiron/cm-11.0' into cm-11.0

Conflicts:
	Makefile