Merge "Update gradle version and GMS core used." into mnc-docs