5.0.1_r1 -> 5.0.2_r1

Change-Id: I549ea7c71cc39fefc4ca89c89fbfdebca4d4ab72

Conflicts:
	default.xml