Updating master with Android-Studio-Conversion