Merge completely with Android-Studio-Conversion