Merge branch 'master' into txxx_bugs
ticket: xxx fix NPE bug in NetworkManager
Merge branch 'master' into android_production
ticket:00 [android] version up