Commit from Android studio, minor changes