5.0.1_r1 -> 5.0.2_r1

Change-Id: I549ea7c71cc39fefc4ca89c89fbfdebca4d4ab72
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0

Conflicts:
	default.xml

Change-Id: I53a5e3a77db3ab4623df79e7fefe31e5c9ec055c