merging android studio 1.5: test fixes