* Sync upstream
* 5.1.0.
* Sync upstream
* 5.1.1: Fix menu key issues
(cherry picked from commit 7d7756b90ff973a616d429ce2a61c57b516b7f79)

Conflicts:
	AndroidManifest.xml
* CSLD bugfix 5.1.2