Fix android application id modification
Merge remote-tracking branch 'origin/master'