Fix Gradle Warnings

Change-Id: I80c05d08cb8f63d6f6f452e23f9840cd3f014440