TAG updated to new name
Merge remote-tracking branch 'refs/remotes/android.git/master'
added function to replace variables in strings