Merge remote-tracking branch 'aosp/master' into aokp-mr1

Conflicts:
	apps/Development/AndroidManifest.xml
	scripts/app_engine_server/redirects.yaml

Change-Id: I0c6b76a19066888bfde4efc5cac66b1f8e36ee10