Merge "Proguard implicitly generates a proguard_dictionary"