Upleveled changes from android.
updating version
Merge remote-tracking branch 'upstream/master'