PA PIE (2/2)

Change-Id: Id257923fc0f4eb6855bbc1c157368dc7bc576f6c

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml