Merge Upstream

Change-Id: Ia79ad8e4d5107f345cbc07ffbc7af8beaa9d1ec4

Conflicts:
	res/values-zh-rCN/strings.xml